# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1153.67.23 -> 1.1153.67.24
#	arch/ia64/hp/sim/boot/boot_head.S	1.1     -> 1.2    
#	arch/ia64/hp/sim/boot/bootloader.c	1.10    -> 1.11   
#	arch/ia64/kernel/init_task.c	1.12    -> 1.13   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/08	rmk@flint.arm.linux.org.uk	1.1232.1.1
# [SERIAL] Make SA11x0 serial driver build.
# 
# Update the SA11x0 serial driver for the removal of system devices
# from the driver model.  The driver becomes a platform device driver.
# The driver is now known to the driver model and resource subsytems
# as "sa11x0-uart".
# --------------------------------------------
# 03/09/08	davidm@tiger.hpl.hp.com	1.1153.67.24
# ia64: Fix things so that they compile with the latest GCC 3.4, which optimize
# 	away static variables with no compiler-visible use.
# --------------------------------------------
#
diff -Nru a/arch/ia64/hp/sim/boot/boot_head.S b/arch/ia64/hp/sim/boot/boot_head.S
--- a/arch/ia64/hp/sim/boot/boot_head.S	Tue Sep  9 01:05:12 2003
+++ b/arch/ia64/hp/sim/boot/boot_head.S	Tue Sep  9 01:05:12 2003
@@ -27,6 +27,14 @@
 	br.call.sptk.many rp=start_bootloader
 END(_start)
 
+/*
+ * Set a break point on this function so that symbols are available to set breakpoints in
+ * the kernel being debugged.
+ */
+GLOBAL_ENTRY(debug_break)
+	br.ret.sptk.many b0
+END(debug_break)
+
 GLOBAL_ENTRY(ssc)
 	.regstk 5,0,0,0
 	mov r15=in4
diff -Nru a/arch/ia64/hp/sim/boot/bootloader.c b/arch/ia64/hp/sim/boot/bootloader.c
--- a/arch/ia64/hp/sim/boot/bootloader.c	Tue Sep  9 01:05:12 2003
+++ b/arch/ia64/hp/sim/boot/bootloader.c	Tue Sep  9 01:05:12 2003
@@ -37,15 +37,7 @@
 
 extern void jmp_to_kernel (unsigned long bp, unsigned long e_entry);
 extern struct ia64_boot_param *sys_fw_init (const char *args, int arglen);
-
-/*
- * Set a break point on this function so that symbols are available to set breakpoints in
- * the kernel being debugged.
- */
-static void
-debug_break (void)
-{
-}
+extern void debug_break (void);
 
 static void
 cons_write (const char *buf)
diff -Nru a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c
--- a/arch/ia64/kernel/init_task.c	Tue Sep  9 01:05:12 2003
+++ b/arch/ia64/kernel/init_task.c	Tue Sep  9 01:05:12 2003
@@ -28,15 +28,13 @@
  */
 #define init_thread_info	init_task_mem.s.thread_info
 
-static union {
+union {
 	struct {
 		struct task_struct task;
 		struct thread_info thread_info;
 	} s;
 	unsigned long stack[KERNEL_STACK_SIZE/sizeof (unsigned long)];
-} init_task_mem asm ("init_task_mem") __attribute__((section(".data.init_task"))) = {{
+} init_task_mem asm ("init_task") __attribute__((section(".data.init_task"))) = {{
 	.task =		INIT_TASK(init_task_mem.s.task),
 	.thread_info =	INIT_THREAD_INFO(init_task_mem.s.task)
 }};
-
-extern struct task_struct init_task __attribute__ ((alias("init_task_mem")));